From 4c1c593d69ffd9781973903d9e9b89058e94c62b Mon Sep 17 00:00:00 2001 From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Wed, 18 Mar 2020 07:13:05 -0600 Subject: [PATCH] CLI renamed to gpsbabel on all builds. (#520) This chases some lose ends from 23379e741bf98603a5737e6f36422b753fc4bbdb --- CMakeLists.txt | 6 +++--- GPSBabel.pro | 1 - gui/package_app | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25807d25a..2aa1ec612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,8 +262,8 @@ add_definitions(-DFILTERS_ENABLED) add_definitions(-DSHAPELIB_ENABLED) add_definitions(-DCSVFMTS_ENABLED) -add_executable(GPSBabel ${SOURCES} ${HEADERS}) -target_link_libraries(GPSBabel ${Qt5Core_LIBRARIES} ${LIBS}) +add_executable(gpsbabel ${SOURCES} ${HEADERS}) +target_link_libraries(gpsbabel ${Qt5Core_LIBRARIES} ${LIBS}) message("Sources are:") message("${SOURCES}") @@ -277,5 +277,5 @@ message("${LIBS}") if(UNIX) # the tests only work if the pwd is top level source dir due to the file name getting embedded in the file nonexistent.err. - add_custom_target(check cd ${CMAKE_SOURCE_DIR}\; PNAME=${CMAKE_BINARY_DIR}/GPSBabel ./testo DEPENDS GPSBabel) + add_custom_target(check cd ${CMAKE_SOURCE_DIR}\; PNAME=${CMAKE_BINARY_DIR}/gpsbabel ./testo DEPENDS gpsbabel) endif() diff --git a/GPSBabel.pro b/GPSBabel.pro index 99d63674c..051e3c7e7 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -279,7 +279,6 @@ QMAKE_EXTRA_TARGETS += clang-tidy linux{ coverage.commands = make clean; coverage.commands += rm -f gpsbabel_coverage.xml; - coverage.commands += ln -sf GPSBabel gpsbabel; coverage.commands += $(MAKE) CFLAGS=\"$(CFLAGS) -fprofile-arcs -ftest-coverage\" CXXFLAGS=\"$(CXXFLAGS) -fprofile-arcs -ftest-coverage\" LFLAGS=\"$(LFLAGS) --coverage\" && coverage.commands += ./testo && coverage.commands += gcov -r -o . $(SOURCES) && diff --git a/gui/package_app b/gui/package_app index 40de4aabd..01c00eb49 100755 --- a/gui/package_app +++ b/gui/package_app @@ -112,7 +112,7 @@ if [ "${machine}" = "Linux" ]; then cp gmapbase.html "${APPDIR}" cp COPYING.txt "${APPDIR}" else # Mac - cp ../GPSBabel "${APPDIR}/Contents/MacOS/gpsbabel" + cp ../gpsbabel "${APPDIR}/Contents/MacOS/gpsbabel" cp gmapbase.html "${APPDIR}/Contents/MacOS" cp COPYING.txt "${APPDIR}/Contents/MacOS" rm -f GPSBabelFE.dmg -- 2.30.2